feat: Outlook calendar cache by volnei · Pull Request #24539 · calcom/cal.diy

volnei · 2025-10-17T18:26:01Z

What does this PR do?

Introduces the CalendarCache for Office365

Summary by cubic

Adds Outlook (Office365) calendar cache with a new subscription adapter, a standardized webhook handshake, and reliable delta syncing in the cache window. Improves event parsing and token handling; the provider remains disabled by default until validated.

New Features
- Office365 adapter: initial sync via calendarView/delta within the cache window; supports nextLink and deltaLink; improved parsing (busy/all‑day, time zones, etags, created/updated, recurring IDs); 7‑day subscription TTL.
- Webhook: /api/webhooks/calendar-subscription/office365_calendar; handshake returns validationToken as text/plain; success responses return {}; validates clientState from headers/body.
- Token management: MS_GRAPH_CLIENT_ID/MS_GRAPH_CLIENT_SECRET envs required for refresh; in‑memory refresh caching; supports delegated service‑account keys.
Refactors
- Subscription job logs succeeded and failed counts.

^{Written for commit 4594507. Summary will update on new commits.}

github-actions · 2025-10-17T18:26:12Z

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

No release type found in pull request title "wip Outlook calendar cache". Add a prefix to indicate what kind of release this pull request corresponds to. For reference, see https://www.conventionalcommits.org/

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

vercel · 2025-10-17T18:36:16Z

The latest updates on your projects. Learn more about Vercel for GitHub.

3 Skipped Deployments

Project	Deployment	Review	Updated (UTC)
cal	Ignored		Jan 6, 2026 11:45am
cal-companion	Ignored	Preview	Jan 6, 2026 11:45am
cal-eu	Ignored		Jan 6, 2026 11:45am

cubic-dev-ai

1 issue found across 3 files

Prompt for AI agents (all 1 issues)


Understand the root cause of the following 1 issues and fix them.


<file name="packages/features/calendar-subscription/adapters/Office365CalendarSubscription.adapter.ts">

<violation number="1" location="packages/features/calendar-subscription/adapters/Office365CalendarSubscription.adapter.ts:73">
If both MICROSOFT_WEBHOOK_URL and NEXT_PUBLIC_WEBAPP_URL are unset, this builds the truthy string &quot;undefined/api/webhooks/...&quot;, so subscribe() skips the missing-webhook guard and tries to register a Microsoft webhook against an invalid URL. Restore the null fallback (and config override) so we fail fast instead of sending a bad endpoint.</violation>
</file>

_{React with 👍 or 👎 to teach cubic. Mention @cubic-dev-ai to give feedback, ask questions, or re-run the review.}

…cal.com into calendar-cache/office365

- Fix import path for CalendarCacheEventService (use relative path) - Fix 'throws error if webhook config is missing' test by stubbing all required env vars - Fix 'performs full sync when no syncToken is present' test to match actual adapter behavior - Add comprehensive test coverage for: - Token refresh and caching logic - Delegated credential service account key usage - parseEvents edge cases (different showAs values, cancelled events, all-day events) - refreshAccessToken error handling - Event filtering (events without id) All 49 tests now passing (6 AdaptersFactory + 17 Google + 26 Office365) Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com>

cubic-dev-ai

No issues found across 3 files

cubic-dev-ai

4 issues found across 8 files

Prompt for AI agents (all 4 issues)


Understand the root cause of the following 4 issues and fix them.


<file name="apps/web/app/api/webhooks/calendar-subscription/[provider]/route.ts">

<violation number="1" location="apps/web/app/api/webhooks/calendar-subscription/[provider]/route.ts:71">
Respond to the Office 365 validation handshake with the raw validationToken as plaintext; returning JSON causes Microsoft Graph to reject the handshake.</violation>
</file>

<file name="packages/features/calendar-subscription/lib/CalendarSubscriptionService.ts">

<violation number="1" location="packages/features/calendar-subscription/lib/CalendarSubscriptionService.ts:126">
Restoring the null return keeps the processWebhook contract for old subscriptions so callers/tests can detect stale channels.</violation>
</file>

<file name="packages/features/calendar-subscription/adapters/__tests__/Office365CalendarSubscriptionAdapter.test.ts">

<violation number="1" location="packages/features/calendar-subscription/adapters/__tests__/Office365CalendarSubscriptionAdapter.test.ts:77">
The tests replace global.fetch with vi.fn() in several cases but the afterEach teardown never restores the original fetch, so later suites will keep hitting the stub and can fail unexpectedly. Please capture the original fetch and reset it in afterEach.</violation>
</file>

<file name="packages/features/calendar-subscription/adapters/Office365CalendarSubscription.adapter.ts">

<violation number="1" location="packages/features/calendar-subscription/adapters/Office365CalendarSubscription.adapter.ts:72">
Rule violated: **Avoid Logging Sensitive Information**

Do not emit sensitive secrets in logs. Logging `this.webhookToken` exposes the MICROSOFT_WEBHOOK_TOKEN value, violating the policy against logging credentials. Remove the token from the log payload.</violation>
</file>

_{React with 👍 or 👎 to teach cubic. Mention @cubic-dev-ai to give feedback, ask questions, or re-run the review.}

Change expectation from toBeNull() to toBeUndefined() to match actual service behavior when processWebhook returns early for old subscriptions Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com>

github-actions · 2026-01-11T22:15:58Z

Devin AI is resolving merge conflicts

This PR has merge conflicts with the main branch. A Devin session has been created to automatically resolve them.

View Devin Session

Devin will:

Merge the latest main into this branch
Resolve any conflicts intelligently
Run lint/type checks to ensure validity
Push the resolved changes

If you prefer to resolve conflicts manually, you can close the Devin session and handle it yourself.

github-actions · 2026-01-14T11:54:08Z

Devin AI is resolving merge conflicts

This PR has merge conflicts with the main branch. A Devin session has been created to automatically resolve them.

View Devin Session

Devin will:

Merge the latest main into this branch
Resolve any conflicts intelligently
Run lint/type checks to ensure validity
Push the resolved changes

If you prefer to resolve conflicts manually, you can close the Devin session and handle it yourself.

Resolved conflict in CalendarSubscriptionService.ts by keeping main's implementation which includes proper channelId extraction and error handling with span attributes for observability. Co-Authored-By: unknown <>

github-actions · 2026-01-14T12:13:36Z

E2E results are ready!

Workflow #105102.1 latest results

github-actions · 2026-02-20T09:52:53Z

Devin AI is completing this stale PR

This PR by @volnei has been marked as stale. A Devin session has been created to complete the remaining work.

View Devin Session

Devin will review the PR, address any feedback, and push updates to complete this PR.

- Fix webhookUrl to return null when env vars are unset instead of constructing an invalid URL with 'undefined' prefix - Fix validate() to handle Microsoft Graph validationToken handshake (GET ?validationToken=...) before checking clientState - Fix MICROSOFT_WEBHOOK_URL test env stub to use base URL (adapter appends the webhook path) - Save/restore original global.fetch in test afterEach to prevent mock leakage between tests - Add test for validationToken handshake validation - Update .env.example: MS_GRAPH_CLIENT_ID/SECRET are required for Outlook calendar cache token refresh, not optional - Apply biome lint/format fixes Co-authored-by: Volnei Munhoz <volnei@munhoz.dev> Co-Authored-By: unknown <>

devin-ai-integration · 2026-02-20T10:08:19Z

Summary of changes addressing review feedback

I've completed the remaining fixes from the code review. Here's what was addressed:

Fixes applied

webhookUrl null fallback — webhookUrl now returns null when neither MICROSOFT_WEBHOOK_URL nor NEXT_PUBLIC_WEBAPP_URL is set, instead of constructing an invalid URL like "undefined/api/webhooks/...".
validationToken handshake in validate() — Microsoft Graph subscription validation pings use GET ?validationToken=… without clientState. The validate() method now checks for validationToken in query params before checking clientState, so handshake requests pass validation correctly.
Test fetch mock isolation — Saved/restored original global.fetch in afterEach to prevent mock leakage between tests. Fixed MICROSOFT_WEBHOOK_URL test env stub to use the base URL (the adapter appends the webhook path).
Added test for validationToken handshake — New test verifying that requests with ?validationToken=abc123 are correctly validated.
.env.example comments — Removed "Optional" prefix from MS_GRAPH_CLIENT_ID and MS_GRAPH_CLIENT_SECRET comments since they're required for Outlook calendar cache token refresh.

Previously fixed (by @volnei)

Validation token response format (plaintext, not JSON) — commit f6580d9
Sensitive info removed from logs — commits cd99cae, 6c6bf07

Notes

Type check errors in packages/embeds/embed-react are pre-existing and unrelated to this PR.
All 27 unit tests pass locally.

wip Outlook calendar cache

81023f2

pull-request-size bot added the size/XS label Oct 17, 2025

keithwillcode added core area: core, team members only foundation labels Oct 17, 2025

volnei changed the title ~~wip Outlook calendar cache~~ feat: Outlook calendar cache Oct 17, 2025

enable cache for office365

70df5e2

pull-request-size bot added size/S and removed size/XS labels Oct 17, 2025

cubic-dev-ai bot reviewed Oct 17, 2025

View reviewed changes

Comment thread packages/features/calendar-subscription/adapters/Office365CalendarSubscription.adapter.ts Outdated

vercel bot deployed to Preview – dev October 17, 2025 18:51 View deployment

volnei added 3 commits October 19, 2025 08:18

Merge branch 'main' into calendar-cache/office365

34754a2

Finish office365 implementation

d0718f8

Merge branch 'calendar-cache/office365' of https://github.com/calcom/…

a3a9d35

…cal.com into calendar-cache/office365

pull-request-size bot added size/XL and removed size/S labels Oct 19, 2025

volnei added 2 commits October 19, 2025 08:26

Fix initial loading

5a5cd10

Add missing env.example variables

6e06393

github-actions bot added the ❗️ .env changes contains changes to env variables label Oct 19, 2025

devin-ai-integration bot and others added 2 commits October 19, 2025 11:42

remove dirty console.log

9d08ae0

volnei marked this pull request as ready for review October 19, 2025 11:46

graphite-app bot requested review from a team October 19, 2025 11:47

dosubot bot added calendar-apps area: calendar, google calendar, outlook, lark, microsoft 365, apple calendar ✨ feature New feature or request labels Oct 19, 2025

cubic-dev-ai bot reviewed Oct 19, 2025

View reviewed changes

test: Fix CalendarSubscriptionService test expectation

766c878

Change expectation from toBeNull() to toBeUndefined() to match actual service behavior when processWebhook returns early for old subscriptions Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com>

vercel bot deployed to Preview – cal-companion December 18, 2025 01:36 View deployment

vercel bot deployed to Preview – dev December 18, 2025 01:54 View deployment

Merge branch 'main' into calendar-cache/office365

2cdfea7

vercel bot deployed to Preview – cal-companion December 18, 2025 11:53 View deployment

vercel bot had a problem deploying to Preview – dev December 18, 2025 12:05 Failure

keithwillcode marked this pull request as draft January 5, 2026 16:05

Merge branch 'main' into calendar-cache/office365

0bf7b6d

vercel bot deployed to Preview – dev January 6, 2026 11:52 View deployment

github-actions bot added the devin-conflict-resolution label Jan 11, 2026

devin-ai-integration bot removed the devin-conflict-resolution label Jan 11, 2026

volnei added devin-conflict-resolution ready-for-e2e labels Jan 14, 2026

Merge branch 'main' into calendar-cache/office365

cd6a87c

Resolved conflict in CalendarSubscriptionService.ts by keeping main's implementation which includes proper channelId extraction and error handling with span attributes for observability. Co-Authored-By: unknown <>

calcom-bot removed the devin-conflict-resolution label Jan 14, 2026

volnei added 2 commits February 17, 2026 09:07

Merge remote-tracking branch 'origin/main' into calendar-cache/office365

f734bf0

Small fixes and upgrades accordingly MS api

1595557

vercel bot had a problem deploying to Preview – cal-companion February 17, 2026 12:09 Failure

volnei marked this pull request as ready for review February 17, 2026 12:11

volnei enabled auto-merge (squash) February 17, 2026 12:27

Merge branch 'main' into calendar-cache/office365

6364f8c

volnei added the devin-finish-pr label Feb 20, 2026

sahitya-chandra closed this Apr 15, 2026

auto-merge was automatically disabled April 15, 2026 14:34
Pull request was closed

sahitya-chandra reopened this Apr 15, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Outlook calendar cache#24539

feat: Outlook calendar cache#24539
volnei wants to merge 23 commits intomainfrom
calendar-cache/office365

volnei commented Oct 17, 2025 •

edited by cubic-dev-ai bot

Loading

Uh oh!

github-actions bot commented Oct 17, 2025

Uh oh!

vercel bot commented Oct 17, 2025 •

edited

Loading

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 11, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

devin-ai-integration bot commented Feb 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

volnei commented Oct 17, 2025 • edited by cubic-dev-ai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Summary by cubic

Uh oh!

github-actions bot commented Oct 17, 2025

Uh oh!

vercel bot commented Oct 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 11, 2026

Devin AI is resolving merge conflicts

Uh oh!

github-actions bot commented Jan 14, 2026

Devin AI is resolving merge conflicts

Uh oh!

github-actions bot commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

github-actions bot commented Feb 20, 2026

Devin AI is completing this stale PR

Uh oh!

devin-ai-integration bot commented Feb 20, 2026

Summary of changes addressing review feedback

Fixes applied

Previously fixed (by @volnei)

Notes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

volnei commented Oct 17, 2025 •

edited by cubic-dev-ai bot

Loading

vercel bot commented Oct 17, 2025 •

edited

Loading

github-actions bot commented Jan 14, 2026 •

edited

Loading